merge
authorEmmanuel Ackaouy <ack@xensource.com>
Wed, 31 Jan 2007 15:25:04 +0000 (15:25 +0000)
committerEmmanuel Ackaouy <ack@xensource.com>
Wed, 31 Jan 2007 15:25:04 +0000 (15:25 +0000)

Trivial merge